Micron Document
πŸŽ–οΈGitΠ―Ρ€Π°πŸŽ–οΈ

Node / meshtastic / Meshtastic-Android / commits / 98e9320

Commit 98e932025be5667085b5538afc5ee43f50a59073

σ°‰– Browse tree at this commit

Parents : 6c06601
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-08-11T18:36:22-07:00
Committer : GitHub <noreply@github.com>
Date : 2026-08-11T20:36:22-05:00

fix(ci): unbreak the merge queue on Gradle 9.6.1 (#6636)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

Changes

3 files changed, 5 insertions(+), 5 deletions(-)

M scripts/verify-flatpak/verify.sh +1 -1
M scripts/verify-rb.sh +3 -3
M settings.gradle.kts +1 -1

Diff

diff --git a/scripts/verify-flatpak/verify.sh b/scripts/verify-flatpak/verify.sh
index 7557d337e2..c35c4798ec 100755
--- a/scripts/verify-flatpak/verify.sh
+++ b/scripts/verify-flatpak/verify.sh
@@ -79,7 +79,7 @@ if [[ $SKIP_REGEN -eq 0 ]]; then
rm -rf "$GRADLE_HOME_ISOLATED"
# The settings plugin (org.meshtastic.flatpak.sources.settings) captures URLs from
# build start β€” no init script or -I flag needed.
- (cd "$REPO_ROOT" && ./gradlew --no-build-cache --no-isolated-projects --no-configuration-cache -Pmeshtastic.flatpakSources=true \
+ (cd "$REPO_ROOT" && ./gradlew --no-build-cache -Dorg.gradle.isolated-projects=false --no-configuration-cache -Pmeshtastic.flatpakSources=true \
-Dgradle.user.home="$GRADLE_HOME_ISOLATED" \
:desktopApp:packageUberJarForCurrentOS :captureFlatpakSources)
cp "$REPO_ROOT/build/flatpak-ops-sources.json" "$SOURCES_JSON"

diff --git a/scripts/verify-rb.sh b/scripts/verify-rb.sh
index e7eff3e662..8398ebca95 100755
--- a/scripts/verify-rb.sh
+++ b/scripts/verify-rb.sh
@@ -12,11 +12,11 @@ trap 'rm -rf "$WORKDIR"' EXIT
echo "── Step 1: Verify aboutlibraries.json determinism ──"
rm -f androidApp/src/main/resources/aboutlibraries.json
-./gradlew :androidApp:exportLibraryDefinitions -Pci=true --no-isolated-projects --no-configuration-cache
+./gradlew :androidApp:exportLibraryDefinitions -Pci=true -Dorg.gradle.isolated-projects=false --no-configuration-cache
cp androidApp/src/main/resources/aboutlibraries.json "$WORKDIR/aboutlibraries-run1.json"
rm -f androidApp/src/main/resources/aboutlibraries.json
-./gradlew :androidApp:exportLibraryDefinitions -Pci=true --no-isolated-projects --no-configuration-cache --rerun-tasks
+./gradlew :androidApp:exportLibraryDefinitions -Pci=true -Dorg.gradle.isolated-projects=false --no-configuration-cache --rerun-tasks
cp androidApp/src/main/resources/aboutlibraries.json "$WORKDIR/aboutlibraries-run2.json"
if ! diff -q "$WORKDIR/aboutlibraries-run1.json" "$WORKDIR/aboutlibraries-run2.json"; then
@@ -27,7 +27,7 @@ fi
echo "βœ… aboutlibraries.json is deterministic"
echo "── Step 2: Build fdroid release APK ──"
-./gradlew :androidApp:assembleFdroidRelease -Pci=true -Pmeshtastic.disableAbiSplits=true --no-isolated-projects --no-configuration-cache
+./gradlew :androidApp:assembleFdroidRelease -Pci=true -Pmeshtastic.disableAbiSplits=true -Dorg.gradle.isolated-projects=false --no-configuration-cache
APK=$(find androidApp/build/outputs/apk/fdroid/release -name "*.apk" | head -1)
if [ -z "$APK" ]; then

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6cafdc3117..917aed121e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -42,7 +42,7 @@ plugins {
// The flatpak-sources plugin reads Gradle.extensions, which Isolated Projects forbids; Gradle 9.7
// enforces that and fails every task in the build. Only :captureFlatpakSources needs the plugin, and
-// its callers already pass --no-isolated-projects, so gate it on an opt-in property. Remove the gate
+// its callers already pass -Dorg.gradle.isolated-projects=false, so gate it on an opt-in property. Remove the gate
// once org.meshtastic.flatpak.sources.settings > 0.1.5 ships an Isolated-Projects-safe release.
if (providers.gradleProperty("meshtastic.flatpakSources").isPresent) {
pluginManager.apply("org.meshtastic.flatpak.sources.settings")

Served by rngit 1.5.2 - Generated in 0.13s